Merge from emacs-24; up to r108145
authorChong Yidong <cyd@gnu.org>
Fri, 21 Sep 2012 03:04:28 +0000 (11:04 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 21 Sep 2012 03:04:28 +0000 (11:04 +0800)

Trivial merge